messageTray: Remove hack for the lack of negative units in libcroco

libcroco now has native support for negative units.

https://bugzilla.gnome.org/show_bug.cgi?id=686240

diff --git a/configure.ac b/configure.ac
index 73ce9f52911458e0ca17a10f8216d827a18358cc..7b10ae9a447174f652b66e2a5a9d8d233deb9c54 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -120,7 +120,7 @@ CFLAGS=$saved_CFLAGS
 LIBS=$saved_LIBS
 
 PKG_CHECK_MODULES(GNOME_SHELL_JS, gio-2.0 gjs-internals-1.0 >= $GJS_MIN_VERSION)
-PKG_CHECK_MODULES(ST, clutter-1.0 gtk+-3.0 libcroco-0.6 >= 0.6.2 x11)
+PKG_CHECK_MODULES(ST, clutter-1.0 gtk+-3.0 libcroco-0.6 >= 0.6.8 x11)
 PKG_CHECK_MODULES(TRAY, gtk+-3.0)
 PKG_CHECK_MODULES(GVC, libpulse libpulse-mainloop-glib gobject-2.0)
 PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 3.5.4)

diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index bb571261a2d0ff499a93cf8437e142ab81d0bb80..d21c7e9377b91a14b4d14bb64b6203aba8530ce7 100644 (file)
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -633,7 +633,7 @@ StScrollBar StButton#vhandle:active {
      * adjust down 8px */
 
     -shell-close-overlap-x: 15px;
-    -shell-close-overlap-y: 12px;
+    -shell-close-overlap-y: -12px;
 }
 
 .window-close:rtl {

diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
index 01d038737abb59b8161caca8526936b9d6c45d35..9fb7e790aff83cededf5ea10b947537bd251d8e9 100644 (file)
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -236,9 +236,7 @@ function makeCloseButton() {
     closeButton.connect('style-changed', function() {
         let themeNode = closeButton.get_theme_node();
         closeButton.translation_x = themeNode.get_length('-shell-close-overlap-x');
-
-        // libcroco doesn't support negative units
-        closeButton.translation_y = -themeNode.get_length('-shell-close-overlap-y');
+        closeButton.translation_y = themeNode.get_length('-shell-close-overlap-y');
     });
 
     return closeButton;